Don't adjust message-sendmail-f-is-evil default anymore; match upstream.

diff --git a/debian/changelog b/debian/changelog
index 377fb3d8b3c36b3ea1c3e4fcd97a8bf27cb54cb1..e8e44e10834880d584a4b2aae8b54ecc5e9bab4c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,13 @@ emacs23 (23.2+1-5) unstable; urgency=low
     Joachim <svenjoac@gmx.de> for tracking down the patch.
     (closes: #597255)
 
- -- Rob Browning <rlb@defaultvalue.org>  Mon, 18 Oct 2010 00:14:01 -0500
+  * Remove debian-adjust-mail-from-addresses-patch.diff to stop
+    adjusting the message-sendmail-f-is-evil default.  Match the
+    behavior of the Debian gnus package, Emacs upstream, and
+    emacs-snapshot.  Thanks to Artem Chuprina <ran@wizzle.ran.pp.ru>
+    for the report. (closes: #397757)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Mon, 18 Oct 2010 00:16:26 -0500
 
 emacs23 (23.2+1-4) unstable; urgency=low
 

diff --git a/debian/patches/avoid-fakemail-mail-loss.diff b/debian/patches/avoid-fakemail-mail-loss.diff
index 23898cf7e44140299098733d1d2775ec790db894..0be69c05401fcf7466464426250fccd099b83d22 100644 (file)
--- a/debian/patches/avoid-fakemail-mail-loss.diff
+++ b/debian/patches/avoid-fakemail-mail-loss.diff
@@ -74,7 +74,7 @@
    :type 'file)
 --- a/lisp/gnus/message.el
 +++ b/lisp/gnus/message.el
-@@ -4594,7 +4594,13 @@
+@@ -4589,7 +4589,13 @@
                                     "/usr/lib/sendmail")
                                    ((file-exists-p "/usr/ucblib/sendmail")
                                     "/usr/ucblib/sendmail")

diff --git a/debian/patches/debian-adjust-mail-from-addresses.diff b/debian/patches/debian-adjust-mail-from-addresses.diff
deleted file mode 100644 (file)
index 0b649d2..0000000
--- a/debian/patches/debian-adjust-mail-from-addresses.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-* The default handling of mail from addresses has been changed.
-  Patch: debian-adjust-mail-from-addresses.diff
-  Bug: 7051 35128
-
-  * The default for message-sendmail-f-is-evil has been changed to t.
-
-    This is correct for Debian systems where we know the MTA should be
-    trusted.
-    
---- a/lisp/gnus/message.el
-+++ b/lisp/gnus/message.el
-@@ -825,9 +825,14 @@
-                (const never)
-                (const ask)))
- 
--(defcustom message-sendmail-f-is-evil nil
--  "*Non-nil means don't add \"-f username\" to the sendmail command line.
--Doing so would be even more evil than leaving it out."
-+;; message-sendmail-f-is-evil is nil here in the upstream source, but
-+;; sendmail works right under Debian Linux, so we want t. [was
-+;; orignally reported for emacs 19 as debian#7051]
-+(defcustom message-sendmail-f-is-evil t
-+  "*Non-nil means don't add \"-f username\" to the sendmail command
-+line, because adding it would be more evil than leaving it out.  Under
-+Debian/GNU/Linux, sendmail works right, so it should be safe for this
-+to be set to true."
-   :group 'message-sending
-   :link '(custom-manual "(message)Mail Variables")
-   :type 'boolean)

diff --git a/debian/patches/fix-gnus-output-to-mail-with-live-rmail-buffers.diff b/debian/patches/fix-gnus-output-to-mail-with-live-rmail-buffers.diff
index bcc07dcc7526d0dc73c03e5c798c2adb51ea3944..0c7e35a774d9935c97c987f7116efe951558bc6b 100644 (file)
--- a/debian/patches/fix-gnus-output-to-mail-with-live-rmail-buffers.diff
+++ b/debian/patches/fix-gnus-output-to-mail-with-live-rmail-buffers.diff
@@ -30,7 +30,7 @@
        * message.el (message-generate-headers): Record insertion of optional
 --- a/lisp/gnus/message.el
 +++ b/lisp/gnus/message.el
-@@ -5322,8 +5322,14 @@
+@@ -5317,8 +5317,14 @@
  
  (defun message-output (filename)
    "Append this article to Unix/babyl mail file FILENAME."

diff --git a/debian/patches/series b/debian/patches/series
index a168d60aa17b8663544d0e50d403e655e88eab9c..ea59bc3795bd16ebdf16c2c830cac1e41f726759 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 debian-site-init-el.diff
 debian-startup.diff
-debian-adjust-mail-from-addresses.diff
 handle-dfsg-split.diff
 misc-unseparated.diff
 require-movemail-use-liblockfile.diff